Rename GDK_WINDOWING_VULKAN

The WINDOWING defines are only for GDK backends, really.
Define GDK_RENDERING_VULKAN instead.

diff --git a/configure.ac b/configure.ac
index d2c715862b25997b5e640bed71ea59aa298a794b..b0d37674bf7c5c0d8423fb38cfddf75ff430b73d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1335,7 +1335,7 @@ if test "x$enable_vulkan" != "xno"; then
       else
           GDK_EXTRA_LIBS="-lvulkan"
           GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_VULKAN"
+#define GDK_RENDERING_VULKAN"
           AC_PATH_PROG([GLSLC], [glslc])
           vulkan_result="yes"
       fi

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 8aba6d1ef4ba5df91f8a802a89cad1160f578941..156b8693e5044f7ac63bc21422ec4bfb4ec9921e 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -24,7 +24,7 @@
 #include "gdkmonitor.h"
 #include "gdkinternals.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -124,7 +124,7 @@ struct _GdkDisplay
   guint double_click_time;  /* Maximum time between clicks in msecs */
   guint double_click_distance;   /* Maximum distance between clicks in pixels */
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
   VkInstance vk_instance;
   VkDebugReportCallbackEXT vk_debug_callback;
   VkPhysicalDevice vk_physical_device;
@@ -133,7 +133,7 @@ struct _GdkDisplay
   uint32_t vk_queue_family_index;
 
   guint vulkan_refcount;
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */
   guint rgba : 1;
   guint composited : 1;
 

diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index c5763c4a4956fd1dad786338909f751727b2f31c..693b36c1e2bbe58778af617f275ec704d5e99efb 100644 (file)
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -22,7 +22,7 @@
 
 #include "gdkvulkancontextprivate.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -62,7 +62,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GdkVulkanContext, gdk_vulkan_context, GDK_TYPE
                                   G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gdk_vulkan_context_initable_init)
                                   G_ADD_PRIVATE (GdkVulkanContext))
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 const char *
 gdk_vulkan_strerror (VkResult result)
@@ -836,7 +836,7 @@ gdk_display_unref_vulkan (GdkDisplay *display)
   display->vk_instance = VK_NULL_HANDLE;
 }
 
-#else /* GDK_WINDOWING_VULKAN */
+#else /* GDK_RENDERING_VULKAN */
 
 static void
 gdk_vulkan_context_class_init (GdkVulkanContextClass *klass)
@@ -861,4 +861,4 @@ gdk_vulkan_context_initable_init (GInitableIface *iface)
 {
 }
 
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */

diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index 42fdbacffdc1924e234470af4b2d8a6dc06980f0..6142c043a06a3277bee962944479d7e2d8a297f0 100644 (file)
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -26,7 +26,7 @@
 #include "gdkdrawcontextprivate.h"
 #include "gdkinternals.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -51,7 +51,7 @@ struct _GdkVulkanContextClass
                                          VkSurfaceKHR           *surface);
 };
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 static inline VkResult
 gdk_vulkan_handle_result (VkResult    res,
@@ -70,7 +70,7 @@ gboolean        gdk_display_ref_vulkan                          (GdkDisplay
                                                                  GError         **error);
 void            gdk_display_unref_vulkan                        (GdkDisplay      *display);
 
-#else /* !GDK_WINDOWING_VULKAN */
+#else /* !GDK_RENDERING_VULKAN */
 
 static inline gboolean
 gdk_display_ref_vulkan (GdkDisplay  *display,
@@ -84,7 +84,7 @@ gdk_display_ref_vulkan (GdkDisplay  *display,
   return FALSE;
 }
 
-#endif /* !GDK_WINDOWING_VULKAN */
+#endif /* !GDK_RENDERING_VULKAN */
 
 G_END_DECLS
 

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9efe829229b18fd19a9ed82c4f23f1e8c323f11f..547a9ae62e890bfb75872150a375d25c614b7026 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2954,7 +2954,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   object_class->finalize = gdk_x11_display_finalize;
 
   display_class->window_type = GDK_TYPE_X11_WINDOW;
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
   display_class->vk_context_type = GDK_TYPE_X11_VULKAN_CONTEXT;
   display_class->vk_extension_name = VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
 #endif

diff --git a/gdk/x11/gdkvulkancontext-x11.c b/gdk/x11/gdkvulkancontext-x11.c
index 0d1038fd38afef3e1991628ee2191a055ed7d863..608a2e22d7b3f55a7022421155c0d7e2611d5068 100644 (file)
--- a/gdk/x11/gdkvulkancontext-x11.c
+++ b/gdk/x11/gdkvulkancontext-x11.c
@@ -22,7 +22,7 @@
 
 #include "gdkconfig.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 #include "gdkvulkancontext-x11.h"
 
@@ -71,5 +71,5 @@ gdk_x11_vulkan_context_init (GdkX11VulkanContext *self)
 {
 }
 
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */
 

diff --git a/gdk/x11/gdkvulkancontext-x11.h b/gdk/x11/gdkvulkancontext-x11.h
index 8c3dab1e6d357613e6abe69e2a79d12e23c514d5..f275c00f9faf644eb55f23abe0f5b7cb91bc0023 100644 (file)
--- a/gdk/x11/gdkvulkancontext-x11.h
+++ b/gdk/x11/gdkvulkancontext-x11.h
@@ -23,7 +23,7 @@
 
 #include "gdkconfig.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 #define VK_USE_PLATFORM_XLIB_KHR
 
@@ -56,6 +56,6 @@ GType gdk_x11_vulkan_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* !GDK_WINDOWING_VULKAN */
+#endif /* !GDK_RENDERING_VULKAN */
 
 #endif /* __GDK_X11_VULKAN_CONTEXT__ */